Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Fri, 30 Oct 2015 16:56:58 +0000 (12:56 -0400)
committerTom Rini <[email protected]>
Fri, 30 Oct 2015 16:56:58 +0000 (12:56 -0400)

Trivial merge